ChangeLog-typo

option --quite should read --quiet

diff --git a/ChangeLog b/ChangeLog
index eddb56638c3e6eb349741c6f4b77cf48d9e42d19..8337da0bc89f052d53ba24e5641fd43135f7523b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
 
-       - Don't use --quite in dotest as it is a Debian specific extension
+       - Don't use --quiet in dotest as it is a Debian specific extension
          to /usr/bin/time
-       
\ No newline at end of file
+

diff --git a/TODO b/TODO
index 285929c2be2d5df663ff9e56deca796df2052c4e..e65f73457669af63a78427a8c643705fe2e0d385 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,17 @@
+- --no-wiggle mode does line-mode merge, but for any conflict it adds
+  a section to show what the wiggle would have looked like
+  <<<<
+  I found this
+  |||||
+  but wanted this
+  ====
+  and would replace it with this
+  &&&&
+  and my best guess is this.
+  >>>>
+
+  best guess only included if there is one.
+
 - search show go to right column and highlight
 - do we always recenter top when we split - what if near but not at bottom
 - side-by-side sometimes shows last line of a chunk with